Skip to content

api: Fix reset configuration#6168

Merged
weizhouapache merged 1 commit intoapache:4.16from
shapeblue:fix-config-reset
Mar 29, 2022
Merged

api: Fix reset configuration#6168
weizhouapache merged 1 commit intoapache:4.16from
shapeblue:fix-config-reset

Conversation

@Pearl1594
Copy link
Contributor

@Pearl1594 Pearl1594 commented Mar 28, 2022

Description

This PR fixes issue with resetConfiguration for settings defined in Config.java

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

Feature/Enhancement Scale or Bug Severity

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

Before Fix:
image

Post Fix:
Successfully able to reset config

@Pearl1594 Pearl1594 requested review from DennisKonrad, nvazquez and weizhouapache and removed request for DennisKonrad March 28, 2022 06:35
@weizhouapache
Copy link
Member

weizhouapache commented Mar 28, 2022

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Mar 28, 2022

@weizhouapache a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan
Copy link

blueorangutan commented Mar 28, 2022

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian ✔️ suse15. SL-JID 2996

@Pearl1594
Copy link
Contributor Author

Pearl1594 commented Mar 28, 2022

@blueorangutan test

@blueorangutan
Copy link

blueorangutan commented Mar 28, 2022

@Pearl1594 a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@DaanHoogland
Copy link
Contributor

DaanHoogland commented Mar 28, 2022

quite frankly, I think this is due to technical debt and we should not fix this but phase those configs defined in Config.java out.

@weizhouapache
Copy link
Member

weizhouapache commented Mar 28, 2022

quite frankly, I think this is due to technical debt and we should not fix this but phase those configs defined in Config.java out.

@DaanHoogland
reset configuration is already supported in 4.16.1 (see #4230). this is a bug fix .

weizhouapache
weizhouapache approved these changes Mar 28, 2022
View reviewed changes
Copy link
Member

@weizhouapache weizhouapache left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tested ok.

@weizhouapache weizhouapache reopened this Mar 28, 2022
@DaanHoogland
Copy link
Contributor

DaanHoogland commented Mar 28, 2022

quite frankly, I think this is due to technical debt and we should not fix this but phase those configs defined in Config.java out.

@DaanHoogland reset configuration is already supported in 4.16.1 (see #4230). this is a bug fix .

It is supported for modern ConfigKey entries, this is extra. I think any Config that needs resetting should be modernised.

@Pearl1594
Copy link
Contributor Author

Pearl1594 commented Mar 28, 2022

You're right @DaanHoogland . And that's something that could be targeted in the next release. This PR pretty much aligns to the way updateConfiguration works.

@weizhouapache
Copy link
Member

weizhouapache commented Mar 28, 2022

quite frankly, I think this is due to technical debt and we should not fix this but phase those configs defined in Config.java out.

@DaanHoogland reset configuration is already supported in 4.16.1 (see #4230). this is a bug fix .

It is supported for modern ConfigKey entries, this is extra. I think any Config that needs resetting should be modernised.

@DaanHoogland
in my opinion, from cloudstack user's view, they should be same: all can be set, updated and reset, no matter they are defined by ConfigKey or in Config.java.
It would be good to move configurations defined in Config.java to ConfigKey, but it is not prerequisite for reset configuration.

@nvazquez nvazquez added this to the 4.17.0.0 milestone Mar 28, 2022
nvazquez
nvazquez approved these changes Mar 28, 2022
View reviewed changes
Copy link
Contributor

@nvazquez nvazquez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code LGTM

@blueorangutan
Copy link

blueorangutan commented Mar 28, 2022

Trillian test result (tid-3733)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 35761 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6168-t3733-kvm-centos7.zip
Smoke tests completed. 91 look OK, 1 have errors
Only failed tests results shown below:

Test Result Time (s) Test File
test_disable_oobm_ha_state_ineligible Error 1511.84 test_hostha_kvm.py

@weizhouapache
Copy link
Member

weizhouapache commented Mar 29, 2022

the test failure is not related to this PR.
merging

@weizhouapache weizhouapache merged commit bcd1a32 into apache:4.16 Mar 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nvazquez nvazquez nvazquez approved these changes

@weizhouapache weizhouapache weizhouapache approved these changes

Assignees

No one assigned

Labels

type:bug

Projects

No open projects
Apache CloudStack 4.17.0
Status: Done

Milestone

4.17.0.0

Development

Successfully merging this pull request may close these issues.

5 participants

@Pearl1594 @weizhouapache @blueorangutan @DaanHoogland @nvazquez